gtkcombobox: Use accessor functions to access GtkTreeViewColumn

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 08a4797c3d8d4de96c3cb7cb33c1c8e6bd7bbbd9..9df273d81c3a77e003d554c82f901002d4441a55 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -4327,7 +4327,7 @@ gtk_combo_box_list_select_func (GtkTreeSelection *selection,
       GtkTreeIter iter;
       GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN (list->data);
 
-      if (!column->visible)
+      if (!gtk_tree_view_column_get_visible (column))
        continue;
 
       gtk_tree_model_get_iter (model, &iter, path);

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 3abc1f4c34092d81579439e8f9d0222338f2584b..dc3e3b717c70962fb43044cad26ae152024278fa 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -2367,7 +2367,7 @@ gtk_tree_view_size_allocate_columns (GtkWidget *widget,
        list = (rtl ? list->prev : list->next)) 
     {
       gint real_requested_width = 0;
-      gint old_width, width;
+      gint old_width, column_width;
 
       column = list->data;
       old_width = gtk_tree_view_column_get_width (column);
@@ -2425,11 +2425,11 @@ gtk_tree_view_size_allocate_columns (GtkWidget *widget,
 
       g_object_notify (G_OBJECT (column), "width");
 
-      width = gtk_tree_view_column_get_width (column);
-      allocation.width = width;
-      width += width;
+      column_width = gtk_tree_view_column_get_width (column);
+      allocation.width = column_width;
+      width += column_width;
 
-      if (column->width > old_width)
+      if (column_width > old_width)
         column_changed = TRUE;
 
       gtk_widget_size_allocate (column->button, &allocation);
@@ -5510,7 +5510,7 @@ gtk_tree_view_key_press (GtkWidget   *widget,
               column->resized_width += 2;
 
               max_width = gtk_tree_view_column_get_max_width (column);
-              if (column != -1)
+              if (max_width != -1)
                 column->resized_width = MIN (column->resized_width, max_width);
 
               column->use_resized_width = TRUE;
@@ -10641,7 +10641,7 @@ gtk_tree_view_new_column_width (GtkTreeView *tree_view,
     width = MAX (min_width, width);
 
   max_width = gtk_tree_view_column_get_max_width (column);
-  if (column != -1)
+  if (max_width != -1)
     width = MIN (width, max_width);
 
   *x = rtl ? (allocation.x + allocation.width - width) : (allocation.x + width);